Revert accidental commit.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/python/xen/xend/server/event.py b/tools/python/xen/xend/server/event.py
index 359f774cf72ba914677eb7bad174784ca0806c34..bf0521c7645ba94a1e696b684f2131208d8ad90f 100644 (file)
--- a/tools/python/xen/xend/server/event.py
+++ b/tools/python/xen/xend/server/event.py
@@ -185,13 +185,11 @@ class EventFactory(protocol.ServerFactory):
         return EventProtocol(self.daemon)
 
 def listenEvent(daemon):
-    pass
-
-#     factory = EventFactory(daemon)
-#     if xroot.get_xend_unix_server():
-#         path = '/var/lib/xend/event-socket'
-#         unix.listenUNIX(path, factory)
-#     if xroot.get_xend_http_server():
-#         port = xroot.get_xend_event_port()
-#         interface = xroot.get_xend_address()
-#         tcp.listenTCP(port, factory, interface=interface)
+    factory = EventFactory(daemon)
+    if xroot.get_xend_unix_server():
+        path = '/var/lib/xend/event-socket'
+        unix.listenUNIX(path, factory)
+    if xroot.get_xend_http_server():
+        port = xroot.get_xend_event_port()
+        interface = xroot.get_xend_address()
+        tcp.listenTCP(port, factory, interface=interface)

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 6756753a2cf3aa6abc36055fdabce526860f623d..d57ca65e5129c4faef9c29b3b2607e49de7227ce 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -3,7 +3,7 @@
 # 'make clean' before rebuilding.
 #
 verbose     ?= y
-debug       ?= y
+debug       ?= n
 perfc       ?= n
 perfc_arrays?= n
 trace       ?= n